Reorganize File Structure

Moving things around a bit :)