Cleanup
Added new files