New file organization + source code model completed