rearranged my files so stuff actually works