file structure updated for acceptance, unit testing and documentation