Changed proj layout and module names