adjusted folder strucutre