Restructure Directory

Restructured directory and cleaned code.