Cleanup of code, moved some folders.