Started some restructure...