Build file rename

Changes to build structure