Updated

Updated with project structure