restructured folder tree and updated build files