Cleaned up

I cleaned up the directories so now each file is in a meaning full directory.