removed unused library usage
restructured directories