Fixed file naming (and source structure) for prettier URLs and consistency