Re-arragned file structure