Removed from active pool when dead
moved some files
moved 2 enums to their own folder