Re-orginised files to match modular style