Commit No. 123 - Folder rorganized, design finalized