revamp files for best practices and naming conventions