changed src structure