Restructured folder organisation and minor cleanups