major refactor of unit files