Cleaned up a bit with subdirectories