Simplified naming and filing
Minor changes to files to adjust pathing for resources