Moved existing classes into separate folders, commit history is lost for them (acceptable at this level)