Cleaned up structure by adding subdirs