Added feature, restructured repo