file names refactored + cleaning shit