Changed the src file structure