Re-arranged files to play nice with new pathogen plugin