Changed structure

Some features are still not working due to no xml parsing