Cleaned up the structure a little bit, still WIP