The directory structure is now similar to the old one + minor changes