Attempted to better organize files