Changed dev folder structure