renamed files and functions
removed ''