Cleaned project, removed redundent files