cleaned up file structures