flattened directory structure
minor fixes and aesthetics