Moved everything out of /src/