improved file structure and added mockup templates