First pass at cleaning up files. Static files moved out of static, all references updated.