Organized Code to seperate

ADK CODE for easy intergration with every Oxmin update