Moved stuff around into better folders and modularised stuff a little better.