Restructuring, added basics and bounds files