Fix shit

I refucktered every file for you :3