File organisation bug fixed.