Reorganized file structure, making things more open source friendly