* Reorganised source code into a folder, for better organisation