Change file naming and correct requiring paths