Capabilities move

* Moving the Caps into their correct folder for upcoming changes