Restructured directories

Make directory structure consistent with other projects