Moved files around, making things ready for wordpress