folder cleanup with updated naming conventions