Move libraries to the root of the project, remove libraries folder
Move the OSD source files around
Move tools the to the root of the project
Remove trailing whitespaces