You need 3 folders:
/Assets: for copy, logo and other images provided by the client/research
/PSD: editable files, can be PSD or AI or whatever you are using...
/JPGs: for screenshots of your mockups and work in progress