Changed the src structure