Moved file structure, fixed building issues