Cleaned up old lab files, cleaned up structure