Reworked directory structure. Continued session.