Removed redundant files and fixed some invalid includes

Closes #15