Massive improvements: class name, file name, file placement
Directory placement