Restructuring files and updated build script (Issue #27)