Cleaned up files and ready for unit tests