Reordering project files and directories. And starting 2ond prototype