Remove unused files
Change project stucture
Change project stucture