Cleaned up the directories a bit and removed obsolete files