Restructured repository.
Changed header inclusion and fixed a forward declaration.