Refactored attributes into their own module and directory