Code cleanup. File organisation is now clean and ready for implementations.