Shuffling things around for better organization