CRAFTERCMS-96: Managing cleanup, moving or removing riles. Removed class...

...es and removed commented code. Added javadoc to some methods