restructure of project for better naming