Restructure

Moving things to make it more clean.