Moved stuff around. Cleaner directories