restructure directories. movin forward!