Reworked directory and file structure.