allign naming and remove unused files