Started reworking folder structure;