changed src folder structure