Fixes mangled directory/file structure.

Also updates to dev-freeze, hence commit log. Specific commit is:
https://github.com/Zuhayr/Baystation12/commit/a22f90414b564ce611a355b48b69bebc4b9f09d5