renamed files and cleanup of code