Added source files
Removed some unused files