Restructure models into seperate data directory