Moved stracture and created setup for packaging