Removed imports and added public files