renamed some things to not conflict with default naespace
restructuring
sure is hot in here