file structure changed to be more logical