Assemble files and make project clearer