More layout and file parser setup
Better module names