Updated src folder structure